-
Notifications
You must be signed in to change notification settings - Fork 612
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rend2 SP #1179
Draft
SomaZ
wants to merge
97
commits into
JACoders:master
Choose a base branch
from
SomaZ:rend2-unified-wip
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Rend2 SP #1179
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Open
Closed
Theres a define in MP that clashes, so it was renamed in MP. Apply this to vanilla too. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
q_shared.h defines "int COM_GetCurrentParseLine( void )" q_shared.cpp implemented "int COM_GetCurrentParseLine( int index )" Fixed now, so function can actually be used. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
Adding mdr structs, one more texture compression algorithm, some zone tags, and SkipBracedSection function Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
Cleaned up alot of noise. Code formating will happen in another commit. All work based on: https://github.com/AntiAnti/OpenJK Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
To match MP
Chose the SP variant of this to get rid of the void pointer in the struct, so potentially less casting.
cg_showtris 1 shouldnt use depth culling. Had overseen this before.
ifdefed sp / mp differences
The saber marks in SP use some additional scaling and there's some missing parts still. Also fixed incorrect ifdeffed if else constructs.
Added working IsShaking Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
Because there's a skyportal in this map, it always culled all the ui elements because they aren't sky surfaces.
when G2_PERFORMANCE_ANALYSIS
Compiles, haven't tested it though
You can now load yavin_swamp again.
5577c98
to
f652863
Compare
Mostly unused variables
The parallax offset simply never got applied to the prepass, which created a mismatch between depth and actual stage rendering.
Gpu buffers, fbos, the gpu shaders and the image pool were allocated twice and leaking the second time... Looks like there's still something that leaks though.
// tr_shade.cpp @ 1549 // hModel is an enum so this is not a valid check null arithmetic if (backEnd.currentEntity->e.hModel != NULL) Thanks to @ensiform for finding it
From the Khronos description about the "new" platform header The OpenGL headers all depend on the shared <KHR/khrplatform.h> header from the EGL Registry . This is a new dependency, introduced in OpenGL-Registry pull request 183 for increased compatibility between OpenGL and OpenGL ES headers.
Now there shouldn't be any attempts at updating UBOs while being used anymore.
Those are handled via uniforms now. Less shaders to compile speeds up load times, having to switch less between glsl shaders speeds up ingame performance. Alphatest cases only commented out for now, will put these behind a cvar later, as some gpus might require to know if a discard can happen or not. [rend2] Fix sky glowing when last rendered surface had a glow stage
it's an UNsigned integer, make sure to use unsigned integers... related bad fix: 9a61f07
Stages that are used to get some more detail shouldnt be collapsed with lighting because it will multiply lighting again and again which leads to incorrect darkening
Vanilla doesn't use rgbGens for surface sprites, only the approximated lighting from the emitting surfaces vertex colors.
Fixes #54 Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So, this is basically a SP port of rend2. This also puts most of the rend2 code to the shared folder. I also started reducing the differences between SP and MP renderer APIs but I think I can do some more, so just a draft for now. This also needs testing.
Many thanks to @AntiAnti for doing the initial SP port and for the additions to the weather code.